tests: Make accessibility-dump output selected children by name

And put one child in every row to make diffing easier.

diff --git a/tests/a11y/about.txt b/tests/a11y/about.txt
index 6bf8e886d9290a313cdef992ef1b7e95d4a4d862..58cca1d5c8e5ba7c1fcc7eee49262dfb25320d78 100644 (file)
--- a/tests/a11y/about.txt
+++ b/tests/a11y/about.txt
@@ -87,7 +87,7 @@ window1
         alpha: 1
         <AtkSelection>
         selection count: 1
-        selected children: 0
+        selected children: unnamed-GailNotebookPage-4
         unnamed-GailNotebookPage-4
           "page tab"
           parent: unnamed-GailNotebook-3

diff --git a/tests/a11y/accessibility-dump.c b/tests/a11y/accessibility-dump.c
index 1a1c21379c34ec47a3481672ee7ee1d5311f65d0..38093ca5f959642176b98c0d9286676a315f3a10 100644 (file)
--- a/tests/a11y/accessibility-dump.c
+++ b/tests/a11y/accessibility-dump.c
@@ -402,14 +402,20 @@ dump_atk_selection (AtkSelection *atk_selection,
     {
       if (atk_selection_is_child_selected (atk_selection, i))
         {
+          AtkObject *object = atk_object_ref_accessible_child (ATK_OBJECT (atk_selection), i);
+          
+          g_assert (object);
+          
           if (n_counted_selections == 0)
-            g_string_append_printf (string, "%*sselected children:", depth, "");
-          g_string_append_printf (string, " %d", i);
+            {
+              g_string_append_printf (string, "%*sselected children: %s\n", depth, "", get_name (object));
+              depth += strlen ("selected children: ");
+            }
+          else
+            g_string_append_printf (string, "%*s%s\n", depth, "", get_name (object));
           n_counted_selections++;
         }
     }
-  if (n_counted_selections)
-    g_string_append_c (string, '\n');
   
   g_assert_cmpint (n_selections, ==, n_counted_selections);
 }

diff --git a/tests/a11y/notebook.txt b/tests/a11y/notebook.txt
index c363093e0da71764d6036222dc5f11c72b074ac8..a5176653603f4cc7d7c1b155bddb9561a69dbc34 100644 (file)
--- a/tests/a11y/notebook.txt
+++ b/tests/a11y/notebook.txt
@@ -17,7 +17,7 @@ window1
     alpha: 1
     <AtkSelection>
     selection count: 1
-    selected children: 0
+    selected children: Tab 1
     Tab 1
       "page tab"
       parent: notebook1

diff --git a/tests/a11y/tree.txt b/tests/a11y/tree.txt
index cef74987a333ca47c9f220e030e622875c566da0..0713b5ee75db7d14608b41753928a864254e3695 100644 (file)
--- a/tests/a11y/tree.txt
+++ b/tests/a11y/tree.txt
@@ -17,7 +17,8 @@ window1
     alpha: 1
     <AtkSelection>
     selection count: 2
-    selected children: 2 3
+    selected children: One
+                       Two
     <AtkTable>
     rows: 4
     columns: 2